Merge changes I8c5ab552,If8546dea
am: 3a8001476d

Change-Id: Ice50ea2dcf05c0693f760e574eb8a97261814a06