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

Change-Id: I4e00fbaefeee3afc4a2fde9e16fe14b169ddcc22