Merge "Updating CDDL schemas to match the finalized spec." into sc-dev