Fix some wfMsg*

Follow up: I8e95484cf86110007dda2cddc3864b1a04bcf5f4

Bug: 68750
Change-Id: I2a0831577797a86d1530dd6d04b707d251d5d1ad