Merge "adjust audio parameters" into jb-mr2-dev