Merge "Add API for virtual preloads" into oc-mr1-dev am: be74124264
am: f35abca9a0

Change-Id: I5afa4315ece4c045aef50195f312eb706be64d91