Merge changes I6aebd812,I0dc6a99a

* changes:
  Remove obsolete method in IMediaBrowserServiceCallbacks
  Remove an import in MediaBrowser