Merge "Update preloaded-classes for JB"