Code cleanup - Change call to Standard Variable constructor with less parameters

GCP-10239

Reviewer: Aldrin Batac