Merge "Add missing @Deprecated annotations."