Merge 3766c94f97dd29922a9930b12970b8c749cbc1b7 on remote branch

Change-Id: Ic28a2424c967863148d546e365baf4d7feb288a7