Fix some wfMsg*

Bug: 68750
Change-Id: Iffb83f754de7ecdf2067f72e6375d6b2d5b80c11