am bfe1b801: Merge "Update preloaded-classes"

* commit 'bfe1b801831ce875a164ad95a07ab03c307e986e':
  Update preloaded-classes