Upgrade from deprecated wfMsg functions
Bug: T70750 Change-Id: Ibd0ddfb992c40d62ad7785e1ef9cbf3bdb452f99