Additional changes: * Mock usage of global mw.{msg,template,config} Change-Id: I67e5cdd5bb275b9083eae0df80af2195c41a7f8e