Merge "Replace test music with something easier to hear" into oc-mr1-dev am: 8ffa1fe8b0
am: daed133174

Change-Id: Ic6c69e43c4105fdb54df332f9c82486092f5a8ae