Merge "Fix ath10k calibration data patch so that it handles experiment removal."