Merge changes Ic4fcbb22,I1be8a18d am: b19f11d09d am: cb06ecd1d1
am: 0668f3398e

Change-Id: Icd44622e7e7687d1f7d7f4f866ed961cb131d36a