Merge b27c952996a0907078dce8fb7a8d01e89c5ab9e4 on remote branch

Change-Id: I3a912ea423df2da92a5da2e94bd72bee3bb2468f