am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."

* commit '4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
  Continue idmap generation even if name lookup fails.