Merge "[CVP] Add all cvp images to reclass" into release/proposed/2019.2.0