am 606b3833: (-s ours) am 50457b94: Gradle plugin 1.1.0 DO NOT MERGE

* commit '606b3833db497ff9e2c6446f199bdd2f47d2fca3':
  Gradle plugin 1.1.0 DO NOT MERGE