Merge changes I3cb77b0c,I4a93a644 am: 803d76061e am: d5fb45ad53

Change-Id: I05062a92cd932114cd1ba8bb126082858f9143e9