am ba0abd0a: Merge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev

* commit 'ba0abd0abdaf3eedd42927eb5b51b202f0f348eb':
  Fix issue #10876433: java.lang.IllegalStateException in...