am 28dba4fc: Merge "Update preloaded-classes for JB"

* commit '28dba4fc394f0736e1d7bdf5601382c19c08f518':
  Update preloaded-classes for JB