am 6c5f4cd0: Merge "Fix hang/crash in native path code" into jb-dev

* commit '6c5f4cd074e1ec4fd22a807aab409586f9b6b45f':
  Fix hang/crash in native path code