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

Change-Id: I83899dd1b0825cc5c807598184ecbf4bc4f3bc33