Merge "MediaBorwserService: Update javadoc" into nyc-dev