Merge branch 'stable-3.2' into stable-3.3

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

Change-Id: I7310b46022042327f24b8fdbbff05596d0650214