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

* commit '5bd70c5eb3ccb5d1eed3f1f7e924a4fb96b0a053':
  Update preloaded-classes for KLP