Merge "Test Native Watchdog triggers RollbackManager rollback"