Use EMPTY_ITERATOR for EmptyList

Change-Id: Ic286c8fa6b01ba21211c0bedac66fb1b15221b1a