Merge 242126c60df7843460161d9189ccb09c02f74a5f on remote branch

Change-Id: I355a05383e58b8f7ab67ea596bcf29c73824fca2