Merge "Adds Context Hub prebuilt xml target" into udc-dev