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

Change-Id: I270fab8009d4c7d9ba10f0cac9e1f3fafe0a977e