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

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