Merge "Fix Audio ramping code"