Merge "Fix uncaught ApiFormatXml exception with api debuginfo"