Merge "Added SystemServiceRegistry to preloaded-classes"