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

Change-Id: If178c9be762fa6f8b4d17af274f05fb04bd12974