Merge "Revert "Errorprone: Temporarily downgrade error"" am: 0f5e278700
am: a6239c4d62

Change-Id: I70e990c4ca6d9c45b9cf55613975660ff42e93fc