[automerger skipped] Merge "DO NOT MERGE - Set country code even when device...
[automerger skipped] Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev am: a0b9d20b
am: 9c2c7db3 -s ours
Change-Id: Ibbe8495142579a5e6e4b9799dd854533c9429061