Merge "Update setAfcChannelAllowance" into udc-dev