Merge change 8673 into donut

* changes:
  Redo perforce change 126665-p9, which fixed an issue with songs purchased from the iTunes music store, but was lost in opencore 2.0.