Merge changes Icb49b30b,Ib52cbfb4 am: 81c8385ab3 am: 42c89602da am: aa895abed4

Change-Id: I6806a523b25c655c5ba82de14779c46a74d57146