Merge "Update preloaded classes" into jb-mr2-dev