am ac90c351: am 17b9c57b: am 14d20299: am d6aa6177: am 008b2de6: Add additional field checks for deserialization.

* commit 'ac90c3512ac80df0f50415c8220515423ed9dbe7':
  Add additional field checks for deserialization.