Correcting the types of the values in the returned data

Partially implements: blueprint test-with-xml
Change-Id: I6db4ac284b224c994ec6b674cfb8cb053e4b2734
Merge "Correcting the types of the values in the returned data"