Merge "Make USB services multi-user aware." into jb-mr1-dev