Merge "Make getdnsnetid returning app_netId instead of dns_netId and fix nits"