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

* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...