Merge changes Ib3c350ba,I9f6b17a6

* changes:
  MediaController: Make getTag() public
  MediaRouter: Remove hidden annotation usages