am 55848681: Add additional field checks for deserialization.

* commit '55848681427721532161c63b43b3f99e912d071c':
  Add additional field checks for deserialization.