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

Change-Id: Ia707f20a780884845994a8e0a5c1b91c2a31b8c9