Merge changes I09a60e61,I2b898e72 am: df35dfbc59 am: 54abed3a76

Change-Id: I89a9a43f38146ace5e40de53eced2259455af23f