am 8e453a03: am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev

* commit '8e453a034183e8688e05d0c6991608626702d56f':
  Allow ungrouping media routes when a group is the only alternate route