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

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