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

Change-Id: Ib88d55c071a16840290a9a9aa437ccca4e708622