Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Add blocked threads check

Change-Id: Icf3fca96bd1df7817c547243dd7603da18e3cb77