am b6d3c1ce: Merge "Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)" into klp-dev

* commit 'b6d3c1cecadb50263c2682a89f9f0b2936bfcd19':
  Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)