Merge "Configurable Audio Policy: Various fixes" into oc-dev