Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev