Merge "Revert "Fixed that locale tracker incorrectly used the invalid cell...
Merge "Revert "Fixed that locale tracker incorrectly used the invalid cell info"" into pi-dev am: fa931b5b
am: 82e3f1ed
Change-Id: Icd267b4a613d5488d7843d2e4d592c9b37e07268