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

Change-Id: I2be1d1af5a02aecaa0f07b90483ca03973b360c3