Merge "Update client code for AudioEffect"