Bug: 15165413 (cherry picked from commit 108166c749) Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
108166c749