Merge "Update comments to indicate whether NAN enums are used as an enum or a bitmask." into udc-dev