Merge changes Ie66ba631,Ic42c09a3
am: cbc409986d

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66