[automerger skipped] Merge "Address nit in NetworkStackUtils" into qt-dev am: f5d37ae8 -s ours
am: 1d7196bc -s ours
am skip reason: change_id Ide4741305724a9e0d26305f8406c5445f9de12b3 with SHA1 ea1a7389 is in history
Change-Id: I18c662d487ce4ed32b9e0c8441fa5c51cab4aa64