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

Change-Id: I142e1fc80ab03e1a5a0febb27db77f724855b6a7