Merge 6dbfdab20dc3177cc259d2bb0c5abc5df40ec5e7 on remote branch

Change-Id: Iab2597dd0b880012d0ef91963d346801072a7e37