Merge "Add tests to run cvp-func and cvp-sanity jobs"