Merge proposals dependent on lp://staging/~jeff-apple/openvista-gtm-integration/bug333538

lp://staging/~jeff-apple/openvista-gtm-integration/bug333538 has no merge proposals.