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

Change-Id: I6b95833e2a6869d2f192b06b7b4a8ab604001f8d