[automerger skipped] Merge "Update exception type thrown when NetworkStack is...
[automerger skipped] Merge "Update exception type thrown when NetworkStack is missing" into qt-dev am: 533f3bcd -s ours
am: 8c2b699b -s ours
am skip reason: change_id Ic1766e839f8f06b539d5f6cfecd29547021fd1d9 with SHA1 7f581219 is in history
Change-Id: Ic7aff9b98f34374ecdb3370b00fd6f27f2a3b1f6