Merge "Fix VMS public API based on API review (ag/2593725)." into oc-mr1-dev