Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd
am: 2b1357fe90

Change-Id: Iee60be352c2e742fdd1d3f7ce15e58e455ac1ead