am 8cb9c581: (-s ours) am b4d7d295: Merge "Revert "Specify test dependecies in rules.gradle.""

* commit '8cb9c581740c2a79e99c1753fb71d05124eb8a9f':