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

* commit '4b87c54b06ed6834785ea06e066bb1e988a76973':
  Revert GC thread changes