Merge changes Iccfe3bd4,I6380245b,I20d9f2fe
am: c23280a1e3

Change-Id: Ifbd8d9d41e69087f421cd1288bfc1337277d6b0d