This reverts commit 0b900c91f6.
Reason for revert: Broke errorprone: b/190454846
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I21de7e7e06daa5f4a688b4246986f8d44da97c91
Fixes: 190454846
This reverts commit 0b900c91f6.
Reason for revert: Broke errorprone: b/190454846
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I21de7e7e06daa5f4a688b4246986f8d44da97c91
Fixes: 190454846