Merge changes Ia4244757,Ibcdf69d9 am: f3186de123
am: 8c67295bb4

Change-Id: I3b07f266890ef5f0ce0d9a3a4f95cd71969dfb0b