Merge "Add @VsrTest annotation to Apf test" into udc-dev