Merge changes I0f7e3578,Ie50dd642 am: 066974d7d2
am: a37e4bcb33

Change-Id: I8e3dd26579bde84d49b64d32885ada94e30fe7d6