Merge changes Ic3993c1f,I06645bb4 am: ac34e9aa3e am: b62afed286 am: 54d05de798

Change-Id: Ib122e011bb7be162b76b94a31885863d2aff6d1e