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

Change-Id: Ic07ab7645f52d0ef61991aca88c328eadb8f7783