Merge 06a705b9e6ec45769fd144ef3f8d06059bb07771 on remote branch

Change-Id: Ia9afee8913ad26a6bcb18024d1f1088557699604