Merge "Gradle build fixes" into lmp-mr1-ub-dev