Merge "Add some more @Nullable annotations"