Merge "Add metadata keys for opaque CSD"