Merge "Add nullability annotations"