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

* commit '492b527183d925958955b6197f4c1aa26d43961b':
  Update preloaded-classes for KLP