Merge changes Ide9daebc,Id47ada57 am: 88ec62afa9 am: eb43144549

Change-Id: I712e6e42cc754db2513321b3498018b21b94161e