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

* commit 'ab58b3894211e0ffaafbadcb70ca9d67c6a7fb5d':