Merge changes I3415d7c1,I0931a59c,Iae2a74f8,I2cad55f2
am: 09ad261e38

Change-Id: Idaa4ab775849b86837993d565c9fdc1c1d5e40a2