am 511bb656: Merge "Fix FieldGap priority queue ordering bug."

* commit '511bb656522e22f0570a9edff8dd295e0de6c145':
  Fix FieldGap priority queue ordering bug.