am df717aaa: Merge "Fix JNI method called with exception pending" into klp-dev

* commit 'df717aaa258e88c1af40b61e42aab86dabec8f61':
  Fix JNI method called with exception pending