Merge changes I6a4c3d9b,Ia5cdb797,I946eb605,Ieff3f6ea
am: 307337fb40

Change-Id: I2e61e0b7650b8b850c3a69fd74ae4d771e08f8cc