Merge "Add more @Nullable annotations"