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

* commit '14567bb00754405fac535bc8be8e46fa8abd7c82':
  CTS: work around ClassLoader limitation