am ffacb2f8: Merge commit \'b696b0b8\' into lmp-mr1-ub-dev

* commit 'ffacb2f8054ca7b96d6634cb7fd1bb2e3fc40222':
  Add Gradle 2.1 distribution. DO NOT MERGE