Fix some wfMsg*

Bug: 68750
Change-Id: I8e95484cf86110007dda2cddc3864b1a04bcf5f4