Merge 4b6405a7f0b4d52e6266683ba49c3e83c5b16e32 on remote branch

Change-Id: I41b3fd5e039bd4a6da4e85029a60314a95fd6091