Merge "Remove location mccmnc check until valid sources are confirmed"