Merge changes Iae3a933e,I08ff5d6e
am: 5b6fbd02f0

Change-Id: I1b586bb32375f18b7bb8d40e83e298782c8d33e8