Merge cf4441ced0307ba4189cf73660bea53596404248 on remote branch

Change-Id: I7bd4003cc50d6f61be19b3d5503245cf84e827a2