am 30175677: (-s ours) am 0aade84f: am 6e7164db: Merge "Implement Gradle awared \'Add JUnit dependency\' quick fix" into studio-1.4-dev automerge: 2e6ab42 automerge: 8bd7cc6

* commit '30175677a6cac7a4e9c29df71c4e80a9f99ea5f9':