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

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