Remove M.message()

And use mw.msg() everywhere.

Change-Id: I94e149d5c3ee81a3f18a6e3743fc3b49d58f6a75
Merge "Remove M.message()"