Switching .msg statements to use only text due to change Ifbeae7e9

Change-Id: I75e37906fdbea683f217c0ebdc8fd35437957d1e