Merge changes Ied888249,Id8857c45 am: 549ea4801b am: f38699f28c
am: f646e106f0

Change-Id: Ieb8d7b8513e7c8982e6886221aec6d1c8b0e941d