Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev