Merge "Fix HPROF DDMS."