Merge "TrivialRebase: Aggregate approvals" into stable-2.6