Merge "Add some preloaded classes related files and tools" into oc-mr1-dev