Headset fix

Change-Id: Id8700cdf39e1cbc40d1fee2e759a1f065d7983c6