Revert "Update from draft_s3i210208-r1"

This reverts commit 5146e72a
5 jobs for cr/TS33128/0165 in 1 minute and 22 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Syntax
passed #8924
checkXSD

00:00:13

passed #8925
parseASN1

00:00:19

 
  Compile And Lint
passed #8926
compileASN1

00:00:18

passed #8927
lintASN1

00:00:17

 
  Merge
failed #8928
MergeTest

00:00:14

 
Name Stage Failure
failed
MergeTest Merge
Merge OK
cr/TS33128/0173
Merge NOT OK
cr/TS33128/0171
Merge NOT OK
cr/TS33128/0166
Merge NOT OK
Merge conflicts with following branches: {'cr/TS33128/0183': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0182': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0173': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0171': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0166': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n'}
ERROR: Job failed: exit code 1