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

Change-Id: I95f28b31387e0bc3e801420ec6cf5ef2a23111cf