Fix some wfMsg*

Bug: 68750
Change-Id: Ie6ee1bca52cab0e0ed4b982db7e6655221a19edb