Merge "Change hard-coded directory."