Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev