am 4e9866a7: am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev

* commit '4e9866a74b19819a7deb78c22ed8814cf8ae8456':
  Change the name of the location config value.