Merge "Fix VMS public API based on API review (ag/2593725)." into oc-mr1-dev am: 6097e37fdf
am: 1e03f475e7

Change-Id: I5891e152184c66dee06b244285d45fed54fb855b