am 71390382: am 9fc841b6: am fe8bae68: Merge "Fix Gradle build" into klp-ub-dev

* commit '713903825f18b52b25c0d00f310d52c6385a40dc':
  Fix Gradle build