Merge 6274a12a3d5b1d603e89d9d981732169704508c0 on remote branch

Change-Id: I47ad6dea9e6f6dde57e7c3a682d68b9336accf63