[automerger skipped] Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev am: fa1f80e771
am: aa0595bbfd  -s ours

Change-Id: I72a76d5645c5ac2d1dbf4a5d24dad0bedaf0019e