Merge "Audio C++ comments"