Merge changes Ie66ba631,Ic42c09a3 am: cbc409986d
am: 788be6d63a

Change-Id: I09e9a64907694c8cf517325da088d70e867e77f2