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

Change-Id: I0b5064cb1eff3a88e8094be49dc953251463a505