Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev am: cc9ff706a4
am: 2693dd810d  -s ours

Change-Id: Ife8dead124a9bf9271bd1713ce23f7af1e6cbb0b