Merge 62c0c21ae762cdc9434778897989aba71b323e08 on remote branch

Change-Id: I301d6a66834818f6cf68a3ebb4999cd07796802a