Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e
am: f41abccf80

Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0