am d87bc0f6: am 8f61a120: Reconcile with open-source gingerbread

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