am f65c4db3: am 1c99b23c: am 172ab0f6: Merge "Query libnetd_client for the appropriate netId for host resolution."

* commit 'f65c4db319feaeec844c8cf3f3eb920a134900e7':
  Query libnetd_client for the appropriate netId for host resolution.