Merge changes I6ff85723,Ia7d743d5 am: f4ddee0f32 am: c01a10f1b6 am: 152edf4eba

Change-Id: I2a74fba00e5f5f22658d662e79bb1660471f8def