updateHeadset

Change-Id: Iaa937ab53fcd2a9b8ea578e459677ecc9cefbdde
Merge remote-tracking branch 'upstream/kk_mkt' into kk44