Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev