Merge "Add missing nullability annotations"