Merge "Remove baremetal xml support"