Merge 601fb8a10e33874b9e3b67c9cfa340ee126decd5 on remote branch

Change-Id: I27336f9238787c22ad0d1d5e17252417dc3beadc