Merge "Fix onCompleteAudioAvailable"