Merge changes I7c418811,I0870eae0
am: 88fb149b8e

Change-Id: Ic1b7ccb20296344bb551fc600d3d6e25fe1fe6a6