Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d am: 6185ee9556

Change-Id: Ie9e18056da529defae5c5a0065607cd972d30b80