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

* commit '7d3fb2d6c5539226a3adcd20cee48177dd8dc571':
  do not request location from unavailable providers