Merge "Dynamic audio policies: device type and address" into nyc-dev