Merge pull request #9527 from mikeller/add_missing_acc_calibration_to_status