Merge "Improve LocationProviderProxy package guessing"