Merge "Call GetDsuMetadataKeyDir() for DSU metadata encryption dir"