Merge 07c96adaad5498f0d8736d0947f3c5aac812fce0 on remote branch

Change-Id: I6a9717ba9b76ddfcfe9f96f638fa25cf8db8252d