Merge changes Ib360d3bc,Iae40d0ab,I486f7b1a,I709a1e30
am: c54ce26589

Change-Id: I9469ef1deb48cfb5f1962498b8f9107fde51f88c