am 427e92a2: Merge "Fix bad references in preloaded-classes" into klp-dev

* commit '427e92a2652c3962df42fc63bc009986c4e15839':
  Fix bad references in preloaded-classes