Merge "Canonicalize mmm path"
am: a5b02ff1ef

Change-Id: Ib9d8de38a7b5d63a2be023b538797df17c5451d5