Merge branch 'stable-3.2'

* stable-3.2:
  Implement deadlock check

Change-Id: I7a3cb4291005e33ea0b409ff89fd07a9fa73d11a