Merge 39dba3e8adcfafbe0cbc282d220100bea97fd1a3 on remote branch

Change-Id: If7a2d91a10b3d21e1823d52e186040f069c462cf