am c40e46e8: am bfe1b801: Merge "Update preloaded-classes"

* commit 'c40e46e8413c112186eadc8526d20306d81c9008':
  Update preloaded-classes