Merge "CDD: Proper MIDI support" into oc-mr1-dev
am: dd5f00385e

Change-Id: I200e380425d4763dae585239ad7ff8eb995f133f