am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

* commit 'e29ff50aae302ef05b0592e4bab6b3090a59254a':
  Clear cached locations when location providers disabled Bug: 12118307