* commit 'a87bdc1f': DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307