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

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