am 5f38b08c: Merge "Fix for ThreadGroup CTS test."

* commit '5f38b08cb74495fbab7b541040de3248a3d49593':
  Fix for ThreadGroup CTS test.