Merge "Expand volume APIs for MediaRouter" into jb-dev