am 83774965: am bc910e5c: Merge "Fix hang" into klp-dev

* commit '83774965fefc5d0315ec41641bdd99cf0a657462':
  Fix hang