am 869d2735: Merge "Fix issues with GC thread." into jb-mr2-dev

* commit '869d273503adbccfae3bac7425649f2e1d2aefad':
  Fix issues with GC thread.