Merge "Fix connection strength to include 0-4 in range" into udc-dev