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

* commit '83322f59a8457b18e571d31c77accfc716f5c4f5':