Merge changes I0f7e3578,Ie50dd642
am: 066974d7d2

Change-Id: Iec4e68b81e0619c2120700bf96260ddb7f7079e4