Support empty lists (a special case of #13659)

Change-Id: I1531c08cc4eca6eeac4034b724966721c5e115a9