Merge "Addresses API review feedback on AudioProductStrategies"