Merge "Move static calls in TunerService to use deps" into sc-dev