Fixed issue with untransformed message

Change-Id: Ib0dad3a4740d4ebaa63185ce1ea7c3671c9f4845
Merge "Fixed issue with untransformed message"