Merge "Add GetDsuMetadataKeyDir()"