am f6c06e30: Merge commit \'be5410ff\' into lmp-mr1-ub-dev

* commit 'f6c06e30b6fdd318304e54fdc702f9c43345526c':
  Gradle 2.2 DO NOT MERGE