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

* commit 'f266c6b93f44fcc674d4c5686af0c1d1b782dab0':
  Update preloaded classes