am 097ed01a: Merge "Revert GC thread changes" into jb-mr2-dev

* commit '097ed01adca362b7c3e49a9301aacbbf3415384a':
  Revert GC thread changes