Merge d0112027dfa7160d91eb7171065759ee749e9988 on remote branch

Change-Id: Iba0d60c709c2c9f8b6db9b76eea428d02d2b4915