Glacier: more headset work

Change-Id: Ia539fdf1d6bb0a23976c1ed3acdb9d9ad7526edd