am 8bad31e: Merge change 944 into donut

Merge commit '8bad31ef86b3179b5725ac6e0ca9f615025b35b9'

* commit '8bad31ef86b3179b5725ac6e0ca9f615025b35b9':
  Set the main thread's context class loader to the system class loader.