am de479873: Classpath cleanups - DO NOT MERGE

* commit 'de479873e52e2e941e9b25cdaa7234a8ff5ade55':
  Classpath cleanups - DO NOT MERGE