Goku and 18

Super lazy post because I can't be bothered to watch through some of the episodes.

Is the first time Goku and Android 18 meet during the world martial arts tournament 7 years after the android saga?