Merge "Fix audio policy configuration for generic targets" into oc-dev