Merge 620ed41abc91b9d09c254f7203ea379dc291fc48 on remote branch

Change-Id: I589eec398b1d03362832b4042a11d3402a3dcdc8