am a88808d4: Merge "Fix access around unknownFieldData."

* commit 'a88808d414308b5b567d3afaab56fc338ad80667':
  Fix access around unknownFieldData.