Fixed import issue generated from merge.