am 7bacaa87: Merge "Keep original order of fields in Class."

* commit '7bacaa878d3070e6ecd762f9fef408828c30dcdb':
  Keep original order of fields in Class.