Magical Derp fix for volume keys

Change-Id: I09b31e2ea5d8f196e03ac73f897ae950f8898fdc