am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1:...

am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

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