Merge changes Ia639dd01,I12cf8838 am: 583a1beac1
am: c1b61bdfed

Change-Id: If7b780f7c941011d52a7a211dc8b21c609fd5d61