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