Merge "Public API changes for audio offload support."