Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev