Merge "Revert "Errorprone: Temporarily downgrade error"" am: 0f5e278700 am: a6239c4d62
am: 25c7d7c5a1  -s ours

Change-Id: I19741aacc020b5e61b1651185031a236eeb69afc