Merge "Update line numbers for P_warnings_deprecated diagnostics."
am: 9525be3da6

* commit '9525be3da63cd939e399234f6b5c2f5e2b723370':
  Update line numbers for P_warnings_deprecated diagnostics.