Merge "Update line numbers for P_warnings_deprecated diagnostics."