Merge "DO NOT MERGE Fix AudioEffect reply overflow" into lmp-dev am: 540acb3db5  -s ours am: afd076b2f1
am: 00cf665d27

* commit '00cf665d27ab9c771d070d422b0b858e84eee54e':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: I92fac0334bc642f47024f785cd5973b6410bcbb5