am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread

* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
  do not merge - Fix issue 3371096.