Merge "Updating GPS_LOCK to 3 in base carrier files"