Merge changes Idc8486ae,I295f4099 am: 6fc86c97e5 am: 61f8760b12
am: d2ef055535

Change-Id: Ic4e1ae9554f59c775844a4695d1c39dc6c7bec1c