Merge "Add watchdog triggered staged rollback test" into qt-dev am: 7364b0e889
am: 17b89c58a8

Change-Id: I54af9fbec07c8e74688837d4245e8764108f17d2