Merge "msm_fb: Calibration config API"