am c3ed28c9: am 174f5360: am 187e6ffe: Dont overwrite cnap name with a failed local lookup.

* commit 'c3ed28c9975217178a89ffbbbf449ac69f54b06c':
  Dont overwrite cnap name with a failed local lookup.