Merge 5d9588d48ac7198ee5f65b6c22c00962e373e746 on remote branch

Change-Id: I814ddaa2fa6fd1dd017ff5884bd5644fdfe43ed3