am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988': DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
This commit is contained in: