Merge "Small service cleanup." into jb-mr1-dev