Merge "Introduce mAffineCalibration for location calibration"