Hygiene: Remove M.prefix

Change-Id: I2b9149d26688c20f88f2de121d67e26dee0ca8b4
Merge "Hygiene: Remove M.prefix"