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

Change-Id: I99894d979515c1c9df634c894082a8e3069aa1b6