Merge changes Ib81bd82d,I9a57fca0 am: 247f318951
am: 1733053810

Change-Id: Ia24bc52191496173035585f2f1997a6474e94142