am 236cc476: Temporarily revert field name change (DO NOT MERGE)

* commit '236cc476e6792a11502ba4f40c7ab4586f40d282':
  Temporarily revert field name change (DO NOT MERGE)