am 61b0ca86: am c9d0294e: Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev

* commit '61b0ca86d3d853172ccc147256a64a9fd2ba6606':
  Prevent occurences of clipping in loud downmixed scenes