This reverts commit e3711ae317. Reason for revert: Might cause build break on errorprone branch Change-Id: Iddece3edf4b1e96fafb8b36282f58410a2476025
e3711ae317