Merge "Add the actual implementation changes for the new metadata field for recoverable key"