Merge 0c9a362c4109b579194003f293f120eb7cf3700b on remote branch

Change-Id: I7af2ddbda135ad4c33be67f341e2e873e74e46a7