Merge "Clean up deprecation tags in support libraries" into nyc-dev am: f7bdb2b am: 7bf17e3
am: e27ab4b

* commit 'e27ab4bca00306af340d50da7ada584f232bb4ea':
  Clean up deprecation tags in support libraries

Change-Id: I0f5eaaca80dc80963be922d8dbaae21f73dbdca9