Merge b1139cc903cdb0e0f1ff581b975dcc252318aade on remote branch

Change-Id: I6a2df5087993af91a9d53983ce01cee33e3d73a5