am b514670d: am 3641ac7d: Merge "Add missing class initialization during compilation and tests"

* commit 'b514670d10bc67eb01f2409488b1037334fa12c3':
  Add missing class initialization during compilation and tests