Merge 811b28ca4e8c8b318d114b6ffee0eec4bd7bc357 on remote branch

Change-Id: Ied58356931ee942baa4ccd40cbe69def5fe49bb7