Merge changes Ia35a4541,Iaf13450d
am: b27d572d21

Change-Id: I6933bb0fe4e3a239068459c2321c849c86d24220