Merge 862bf90134fa6f02610fc0414ba25baf8ee954a3 on remote branch

Change-Id: Iefd04426602906e1922012515fa610e614435b46