Replace deprecated wfMsg and friends

Bug: 68750
Change-Id: Ia4f7080b7b2ed7fb01b4a1b4da36d033adbb1b74
Merge "Replace deprecated wfMsg and friends"