am 8f61a120: Reconcile with open-source gingerbread

* commit '8f61a120f7a71da4c12f399aca33d1f5fffba0c5':
  Alpha addresses get put in the same thread