Test: None Bug: 78685119 Change-Id: I3f4d5601ab955fff8e63589d391c8cfd2b62e627 (cherry picked from commit 25dbc468) Merged-In: I3f4d5601ab955fff8e63589d391c8cfd2b62e627