Fix OpenSearchXml integration

Change-Id: I9f8dad09945e69bf45ec785a6383c2449551fbac