Merge changes If24c6b7c,I381b0103 am: 67b7e64034
am: aeda63b106

Change-Id: Ib0e206f27aa4f6cacb0e67cb7dc18cf3660872ba