glacier: headset changes

Change-Id: Ic60fa74ba50df598931f08631eea8aa72ea72ec5