Merge changes I6dc353a2,I7df990f0 am: bb612a356a
am: 3a3e02e835

Change-Id: I90957532ce6fcacf184946ce103476334ae0b6a2