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

Change-Id: If3f257f00bcc4147e7d4cc85fdfe03b00b319d76