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

* commit 'bc910e5c8d05f24531bd6b11379cf41cc73415ed':
  Fix hang