Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev