Merge "SDK repo: fix to handle new and old xsd for support lib"