Merge "Ensure we don't record 0 MCC/MNC." into udc-dev