Merge "Change generated dependency file names"