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

Change-Id: I2f451e2a03e6f35b824b7df9273322448a146ed0