Merge "Opt in to allow BAL" into udc-dev