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