am 9ee5d6cd: Merge "Add missing field init in constructors"

* commit '9ee5d6cdc14ac94b64ea1961bf221bad48746929':
  Add missing field init in constructors