Merge "Make nullability annotations placement consistent"