Merge 6dc0470222b584967119ca7e1511db2875360e0a on remote branch

Change-Id: If688c0a9db290e7a030cfad480143e3ebf512ad1