Fix for String type going away in SMW 1.9

Change-Id: I545aa7fddc153b29008e285f8268b3f6d54bfc6b
Merge "Fix for String type going away in SMW 1.9"