Merge "DO NOT MERGE Fix AudioEffect reply overflow" into mnc-dev am: e29e934c6e am: a95c6afecb am: a17042b108 am: ba5a77d72a  -s ours
am: b18875e5f7

* commit 'b18875e5f775b7a6894f45ca1000e10eb7362edb':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: I8c341166111379d38dd1e0364d44fbf52b352886