Merge changes I8d0c60e5,Ib8ad0ad6
am: a6bb369cb0

Change-Id: I1f6da82e3d8cc4646eca6403bf1f1b7266665fbf