Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into main