Bug: 162472196 Test: m Change-Id: I44ffdf07c181cb4a119ec5de73bcb9ffaf485504 (cherry picked from commit 5ec70249) Merged-In: I44ffdf07c181cb4a119ec5de73bcb9ffaf485504