am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only...
am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev
* commit '95cf8c11':
Allow ungrouping media routes when a group is the only alternate route