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