Merge changes I3415d7c1,I0931a59c,Iae2a74f8,I2cad55f2 am: 09ad261e38 am: ca393d8b38
am: 4461fde277

Change-Id: I0acb880a4c07f72aace027f85ede5454884267ed