Merge e0d6c0f3b5d9c511103fd15c88af3938cb082110 on remote branch

Change-Id: I8245dfde5efaedc3d2465979ecae81260bb3b9fe