Merge "Convert NAN enums that are used as bitmaps to an int." into udc-dev