Merge 5ff3e587ab65775c7b5f6cd26c4d2d3ed6902596 on remote branch

Change-Id: I0ce9cd9204d0ba2da3e1b98def05a5e4ffb6bf2e