Merge changes I09a60e61,I2b898e72 am: df35dfbc59

Change-Id: Ifd9b9a4ae1642fd73a9606c75b32770a16648840