Merge d4e8ced33fbadf778459b4eb36d31343f3068a2f on remote branch

Change-Id: Ie74f4cb56820fcd373eeb2aff0a0e2d59df26b95