Merge "Replace test music with something easier to hear" into oc-mr1-dev