Merge "Prune long-deprecated APIs"