Merge changes I2a74050d,Icbb36590
am: 762bc13716

Change-Id: I1ffe5d726d0bb6f0073a6e76fde6a35d05def38f