Merge "Upgrade Kotlin and move properties to parent."