(cherry picked from commit af27bf66) Bug: 64328974 Test: m Merged-In: I3729a3132c1ef07dded69801373edf51006fa623 Change-Id: I3729a3132c1ef07dded69801373edf51006fa623