Merge changes I2ba1a613,Icfa4d975
am: 3598a59db2

Change-Id: I70a14de700c8ddb136096cdb180818bf4390a1ed