[automerger skipped] Merge "Make getdnsnetid returning app_netId instead of dns_netId and fix nits" into qt-dev am: ef525f6943 am: c2bd5a39f2
am: 419cef805c -s ours
am skip reason: change_id I920cbc7b63790c4937acc56d1811fc04026e11fd with SHA1 6f61c9c5df is in history

Change-Id: I98e590f30f27d7657e1607c50095bae8e2a16a61