Merge "Clean up deprecation tags in support libraries" into nyc-dev