Merge "Add tests for NetworkStack failure notifications" into qt-dev
am: d63457c64b

Change-Id: I48fd3858b01f36b8c4bb86ce8313dcccf8a0a508