Fixed automatic setting of list values in maps.

Change-Id: I6d06f994ee54c7624df3cdeb0aff15fab0f8606e