am 7b920976: am de479873: Classpath cleanups - DO NOT MERGE

* commit '7b920976c774b69f80592b60718960d21faec2a7':
  Classpath cleanups - DO NOT MERGE