Also fix a bug with multiple pending lookups dropping information. Change-Id: I8348f126e6b0a17cf762ebb720d1c306d3b4923a