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

Change-Id: Id335b74f0e07e9816190e8591f3f732c0a5454c4