Merge "Rename key_dir to metadata_key_dir and refactor" am: 60a55d91dc am: 6e9e22711f am: 47b53f98c1

Change-Id: I466546c2c8490f4e544280ac5130cd83365c8e0d