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

Change-Id: I654a3817ea0efd59805c125225c9be24cffd8e5b