Minor cleanup in SMWDataValue

Change-Id: Ide21233b06880aaafbfe5eead2d40a46aead9f74
Merge "Minor cleanup in SMWDataValue"