am ab977264: am 5856fd89: Merge "Fix recursive locking bug." into klp-dev

* commit 'ab9772641cad9342e615b21e5a4afb665e40cacf':
  Fix recursive locking bug.