Merge "AudioBufferProvider comments and cleanup"