Fixed Windows segfault due to invalid iterator.

Change-Id: Ie0df4284576606df59b67504acec800bc73fa0a4
Merge topic 'lookup_table_cleanup' into next

86879da0 Fixed Windows segfault due to invalid iterator.