am 81852bf5: Merge "Fix LinkFieldsComparator."

* commit '81852bf5a1d4640b7b22b8a0404ce8401a7219c6':
  Fix LinkFieldsComparator.