Merge "Add one-time flag to test api" into rvc-dev