Merge "Fix GeolocationTest" into mnc-dev