Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread