Merge 7ba45f348ba4e5f257b26db87824c0a165e0480f on remote branch

Change-Id: Ib05d79eeb23ee8590fdf395ae99e562e66c80369