Merge "MediaBrowser: Applying API Review" into nyc-dev