Merge "Added fp_bad_calibration to fp enrollment." into sc-dev