Merge 31069fc482fba28646cee312f474f75fbed023a4 on remote branch

Change-Id: Ic9c30a79f502892d8fe89dbf9d68712b76ee2d2f