Explicit refs to globals

Change-Id: I86e8cd9991f8f1df783b8b7fa6f4efd273f46329
use wfMessage

Change-Id: I37131b30ff4ac8c5cbeee89dd99e465b0da5ba93