Merge changes Ia47e566b,Ib94d79a9 am: b9e2ddfc10
am: a2161c5ccb

Change-Id: If1125419d50b8291bcb056dd4bc7ecd6ea2b5342