Merge 3940d931fa719d37e65088e6a6b484cdc128d5f1 on remote branch

Change-Id: I5a8fdf7a0290b5cffe71983cf9e62d4bc457236c