Merge changes I234b2f09,Ifdca65fc
am: 4c8326f8bb

Change-Id: Ie5dec66495a51a55a3eb6e3939d43b9a8623e045