Merge changes I2ce11db5,Idba8278b am: dd3f863499
am: 198134666b

Change-Id: Ibe861546bc113889034ee9d0e37c4368e4e13eac