am 7ab099c1: am 492b5271: am 5bd70c5e: Merge "Update preloaded-classes for KLP" into klp-dev

* commit '7ab099c139233611a8281e22b3ca226c7d00920a':
  Update preloaded-classes for KLP