Merge changes Ic3993c1f,I06645bb4 am: ac34e9aa3e am: b62afed286

Change-Id: Id009631e1622d1534674332a1f146934fb4841a5