Merge "Set country code even when device is not registered on network" am: fc9bc10d69
am: ba7001c930

Change-Id: Id8b309a081996af590da42cbc73ded3c2c09b153