Merge "Remove CHOOSER_UNBUNDLED flag" into udc-dev