Merge "Use the public constructure of FastXmlSerializer"
am: cd45cddcc9

Change-Id: Id3c1f7961681d1cce104a3fc9497e7718e80ca41