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