Merge changes Ifed43649,Ib59bf558 am: 0e691c8443 am: 9fcdfb26f9
am: 02b6b5984f

Change-Id: Ie9bb3961e96f24764cc8cb065b4dbabd712aef43