Merge "Bug 5591 - Changed DeviceContext to DeviceState in translate methods of Messag...