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

Change-Id: Ie7687c67680d9adbb16ccfbfa10bf668eaeccfc2