Merge ff242cf9a1ff04e5972f8ce67e1188c1ace71da3 on remote branch

Change-Id: Id49160f4232a34a2d3d2a7e63d3218a0af2e5473