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

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