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

Change-Id: I994d9d6f327a204916fe9145cc6ce9a2b511d307