Bug: 157380700 Test: manual Change-Id: Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4 Merged-In: Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4