Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev