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

Change-Id: Icd67118283426d29b3b8292a6193b89480ebaeb1