Merge "Add more nullability annotations"