Merge 8127c717466048365c1b63bd0bdbec92c56d6ad6 on remote branch

Change-Id: Iff71d7641adf1bf1f4170aa0a84c18147d71baa0