Merge 774bf10e8c88b1871267dc381c1ff57293f9e1a3 on remote branch

Change-Id: Ie3642db293bd5b8b0a94785e017b4806b900d568