Refine calibrator usage

Bug: 316103317
Test: Manually run the scenario
Change-Id: If57396696b6a7d10e289ab0f2e7b14148034d34b
3 files changed