Merge 1f24093395ce6b0f59cfeb53c61821e124e52d94 on remote branch

Change-Id: I652920610875a2c89d1b0cf165021b2349f63596