Test: ./gradlew test Bug: 109781942 Change-Id: I06c3be06def30803e5dda3069686f0ff510b804d (cherry picked from commit 466c50ab)