Merge "Vendors may choose dm-default-key options format" into rvc-dev