Bug: 139120468 Test: m Change-Id: Iee24fd8e70805eab3e352186e543fe02246a6a72 Merged-In: Iee24fd8e70805eab3e352186e543fe02246a6a72 (cherry picked from commit f4b5a5ba)