Merge "Update preloaded classes for O" into oc-dev