Merge 5880651a53cf00c707877ccfd242149b5d4b4723 on remote branch

Change-Id: I368f4bc064b7961671228b7d2c7f3450696ecd02