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

Change-Id: Iaacfbe8b221d79e3d06d0d7ea81528db13e4611a