Merge "TrivialRebase: Adapt to labels in 2.6" into stable-2.6