Merge "Fix errant nullable annotation" into main