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