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