Merge "Set country code even when device is not registered on network" am: 0afecea735
am: bfa6b55719

Change-Id: I7018cdf0a216e57eed39553f9828a66ae2fb1673