Merge "Fix sound rate limiting issue" into oc-dr1-dev