[unrelated] Fix new null annotation errors
8 files changed