move xml to upper-level for next merge

Change-Id: I5c68de616b532841056eaf5a4ba844fda5aa03ad