am c88d3296: am 329b760e: Revert "Change the name of the location config value."

* commit 'c88d3296f4fc308559e3747a38f2b499336dfe49':
  Revert "Change the name of the location config value."