Bug: 112048937 Test: ./gradlew test Change-Id: I4aa4bda4d5b422c49bada65f9e27bffc931bac15
mentioned in commit d8bac89c