Merge "FP2-1575: audio policy service: fix possible memory overflow" into fp2-dev-v2