am 31bb1dec: am 5b543775: Merge "update preloaded-classes"

* commit '31bb1dec27c1f8e5c96e52d0a7655a231412376f':
  update preloaded-classes