Merge "[AWARE] Fix type of channel width to use enumeration"