Merge "Bug 539626 - [IoTML] Add support for data types"