Merge "CDD: Mandate metadata encryption" into rvc-dev