Some linters do not work properly without those annotations.
This was done with a batch replace.
Also needed to turn off two lint rules, they will be re-enabled in the
followup change. This way the batch change can be clearly separated from
manual modifications.
Change-Id: I891ae09689520edaba5588c1f2206766db2d2b90
