Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev