Merge "Canonicalize mmm path" am: a5b02ff1ef
am: 619e1dbb66

Change-Id: I2906fb3ee2a459a0e648bbc77d944e621feb88fc