Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Follow up to: "Fix BlockedThreadsCheck failing with un-blocked..."

Change-Id: I94401e6090c69296a88e86489659419dfa997b4a