Merge "Rename session classes to have media prefix, hide routes"