am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev

* commit 'f9b70ab87e8f26b57ac3d8dc3b77052e747cb888':
  Debug issue #10876433 java.lang.IllegalStateException...