Merge 8d920eed71f7722d2b1a477978e62843acac67f8 on remote branch

Change-Id: I5b382fdee11b0927aaeff0764d8fbca43ae98d0e