Merge "Fix overcounting of mobile radio" into mnc-dev