Merge "Fix Gradle build" into klp-ub-dev