Merge "Add ROLLBACK_RESISTANCE definition to for KM4"