Merge changes I768f0948,I3d79bb35 am: 2474ba9744 am: 2f5f475c3e
am: 2c54efa044

Change-Id: I7a4128ad78a99ec06d048511c243144f20d424c8