Merge "Add @Nullable annotations for simple cases" into sc-v2-dev