Merge "Add network health check watchdog triggered rollback tests" into qt-dev
am: 80b53bd68b

Change-Id: I760b8f0d948702a51b96c3aaffa6ccb268b891fe