Fix set + list concat

Change-Id: Icb88e70c4449cff3143bd61c68cd05b557f875f4