am 7831fd2f: am 7d3fb2d6: am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev

* commit '7831fd2fdb46572025195b4b8ec6f1f5b3d9b8c6':
  do not request location from unavailable providers