Merge "Audio edits." into jb-mr1.1-docs