Merge changes I8f2cc1b0,Ief62aa57
am: 058357a509

Change-Id: Iac62c82b30c8a0e5c2fcf01cdfc661c1302f8637