Merge "audio policy: enhancing type conversion helper"