Merge changes Ib7daba9c,Ib692bff0 am: 75b7e58c47 am: 72dcf0a781

Change-Id: I881ade99a6dde6566b12974b058efa4a5ef13073