Start tracking own DSPManager upstream changes in CM broke my build.