Merge branch 'stable-3.3' * stable-3.3: Add blocked threads check Change-Id: I4dbe09c3ba43ea1ee85c73fd2e8ff5b9fb115536