Merge "MergeUtil: Remove legacy label ID" into stable-2.6