Merge "DO NOT MERGE Fix AudioEffect reply overflow" into lmp-dev am: 540acb3db5  -s ours am: afd076b2f1 am: 00cf665d27 am: 3b4e570062  -s ours am: ac2e19562a am: b50988e8be am: 0f8a045c44 am: 56ff3ab24c  -s ours
am: 8716aa5212

* commit '8716aa521201fdad51d24681a9e0cd40dda36246':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: If31a8eda826ad03adafb61a7e1a4c0311deec122