Merge "Rename key_dir to metadata_key_dir and refactor" am: a7463139cd

Change-Id: I14535278f6e2b0ffe6c322a2e9bd7e2ae608105f