am d3616c07: am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev

* commit 'd3616c07f7a39efbf6a1e4c85ede57fe0214430f':
  Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)