Merge branch 'stable-3.3' * stable-3.3: Follow up to: "Fix BlockedThreadsCheck failing with un-blocked..." Change-Id: Idda21fba7713fc62b23b9ec7330a7f8f8f1e21d5