Merge 8951efeee6e1b5aa74354cfa54f128d6019b1845 on remote branch

Change-Id: I7369a2af086f0763cb5c2a2123e962a36b930928