Zero: Keep things DRY - removed duplicate IDs

In order to prevent accidental missmatch of IDs,
which could happen when copy/pasting, removed X-CS duplication.

This makes it identical to how its done in the general case at the bottom.

Change-Id: I78c56e4c0f5307365310dfa1c464c272d4adb34c
Merge "Zero: Keep things DRY - removed duplicate IDs" into production