Merge "Add nullability annotations and imports" into sc-dev