am f083ae58: am 95b2299d: Merge "API for location settings injection" into klp-dev

* commit 'f083ae58594720a65b35491e6206ef2baff621d3':
  API for location settings injection