Merge "Move DataSourceUnwrapper to MidiIoWrapper class" am: e512cd3def

Change-Id: I68a2626798138e75d448726877cce9efb43fc4bf