Merge Derp : Fix Safe headset volume code

Change-Id: I733c201539f00b5e2b870d8493af1f0bd22792c5