Merge "Fix testNeedGeoFencingCheck"