Bug: 221846447 Test: build pass Change-Id: Ia977d59492d00bb5499523ca17cde92fd932292e (cherry picked from commit 9e3dae6628)
9e3dae6628