am df58a1bb: am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread

* commit 'df58a1bbf8d7f6608848eae4d5d48dcff137dc8c':
  Attempt to reduce problems from issue #3183612