Merge "Modify hard-coded directory."