Version bump to 2.2.1
mccmnc fields in trp proto