Merge "Add missing @Deprecated annotation."