Merge 943057f5089df232a3e96ca89cb62bf950f83846 on remote branch

Change-Id: Id48705b7822ffe97c14c61ccd269250cec55d45d