[automerger skipped] Merge "Fixed that country code was not updated when...
[automerger skipped] Merge "Fixed that country code was not updated when airplane mode is on" am: f73ce141 am: b0dbaac7 -s ours
am: 344bac5a -s ours
Change-Id: I5aeb242dd32f921879374279085ccb800c68897a