am 3e3a3a2b: am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"

* commit '3e3a3a2b794531c517064cc115f8f5e00da07b4a':
  CTS: work around ClassLoader limitation