Merge "Fix sound rate limiting issue" into oc-dr1-dev am: 61913f178e
am: aba1488c5c

Change-Id: I599508352014797b01573b2306c597ad5d98c7f1