Merge "Pass volume key as a KeyBuffer" am: 334a684557 am: 4d37b4f980 am: aebcc399ea

Change-Id: I7f410a56f2c301557657f9357494bcf97c7cf92d