Merge branch 'stable-3.3'

* stable-3.3:
  Fix BlockedThreadsCheck failing with un-blocked threads
  Use Guice injector for BlockedThreadsCheck in tests

Change-Id: Ib894830fbfa10720d968415ccf6bbfc95f7f8955