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

* commit '6023873463331d30b7ed12942c3323f1b6975ed8':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...