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

Change-Id: I0d3f100a55f3c8a9e2c0d2961e90065d453708ae