Merge changes Ide9daebc,Id47ada57 am: 88ec62afa9

Change-Id: Ied52fed05566a0d75e82007170210205db7832a8