Merge "Update audio comments" into jb-mr1-dev