Merge changes Ic39b6d55,Id9a392ac,I1a6b05ea
am: 89bed6d6fc

Change-Id: Ifd30dd21adde42326bd5633f0c01fcf918d1cf68