am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev

* commit 'f99177f3944e06fc7a1a516a0b703794e39af5f1':
  Update preloaded classes