Merge "Add trivial nullability annotations."