Test: Manual, updated `./gradlew test` Bug: 29574531 Change-Id: I1db6beb3bd4d6c4ab34e7dfeab79ed8976756332 (cherry picked from commit fc01f70b)