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

* commit 'abc7f5438c2b63864ba964f155d1efe7ea006803':
  Fix bad references in preloaded-classes