Merge "Add nullability annotations."