Merge 7480bcf79ba9e49c5f4773611c7dabbaef357eb6 on remote branch

Change-Id: I2e60dd2965414bd967e252fe03b46972944c6d2d