Merge "Fix FastXmlSerializerTest" into mm-wireless-dev