am c8901ac3: am 51d7c62b: Merge "improve audio calibration" into jb-mr2-dev

* commit 'c8901ac30f89fa14919b6e7e617fca479244d115':
  improve audio calibration