Merge "Update test annotation with new VsrTest tag" into udc-dev