am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."

* commit '55ef21bca9802af2a9aadd593cc606706b13f8da':
  Fix access around unknownFieldData.