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

Change-Id: I017400aa3ef988435914ef2770b20bd78a0c1c10