Replace remaining deprecated wfMsg and WfMsgForContent calls.

Change-Id: Ib5392fdf770e8290c2dfc5fcc7e888ed94a30640