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

* commit '59e5780ad5d577716ca4fad3074aa55eba8f01c1':