Merge "improve audio calibration" into jb-mr2-dev