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

* commit '3b4e570062ab7eea6ff6fc7464c8dd8cf7b35878':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: I73726a2bfeeef4e0efc25b37e5adf37e1be66332