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

* commit 'c7936863dafc081e8e2ccdca9712807bab2fe318':
  Add missing field init in constructors