Merge d4e8ced33fbadf778459b4eb36d31343f3068a2f on remote branch

Change-Id: I7aad2d7139a6f67ef1682f0f271ce90744648273