Merge "Probable fix for LocationManagerTest on devices w/o GPS"