This reverts commit 14a23621. Reason for revert: Breaks art tests on errorprone build Change-Id: I2e21867fba6c8c1660ffa564273b6200c63221f3