Merge 7ff3b1b5e4b2598caf22e265f365430cf27903e0 on remote branch

Change-Id: Iac1ec8fe609b9849711bc1fb44fc3561974d806e