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