Merge 6fd11b621e7b0a9164cbb108f7a8ca0cb2f9e902 on remote branch

Change-Id: I16bf5d21a18578f6a09c250caeca6790e04c9bf2