Merge "[Reclass] update CVP Sanity" into release/proposed/2019.2.0