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

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