Merge changes Ide5ec431,Icf2f8fae am: 5e20ba7b1c am: 6ea490ef54
am: 6c6b533826

Change-Id: Icdb752ba0d82147ff292bc465cdc48d763b5a044