Bug: 229771520 Test: Automated Change-Id: I7e921038a803188eee4cc437b7076db97ecdd853 (cherry picked from commit 1323984d) Merged-In: I7e921038a803188eee4cc437b7076db97ecdd853