Merge "Add API for virtual preloads" into oc-mr1-dev