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

Change-Id: Ia5a1a2f96ba406987c60cc8fa4d94bea33b68644