Merge "TrivialRebase: Avoid re-adding -2 for code-review label" into stable-2.7