add code to xml to fix error

Change-Id: I73220ea0b30e62d9b467d3eabcd14ab847aae7c6
remove duplicates

Change-Id: I8d6f159defe03d81e4a23108f7c108f06c0b3f33