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

* commit '74c32d6adc3cc92f8b4e237089908cff695f2720':
  Fix FieldGap priority queue ordering bug.