Revert "Migrate off jsr305 annotations" am: 292e4dd10c
am: 20e3dceef0

Change-Id: Ic363336d1f99eac387184319ed01a908b5d75fca