Merge "Adding USB Headset awareness." into oc-dr1-dev