am a353581c: Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb

* commit 'a353581c65dba1ca5a27f33a05a0077ffdabf72a':
  Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...