Fix issue with USB headset not being recognized when boots
am: 22c2ce9cfe

Change-Id: I7e98cdf43e2803fc3b9a400cd694540f9cff7235