Merge "Canonicalize mmm path"