Merge "Update preloaded-classes"