Merge "Update references to migrated global settings." into jb-mr1-dev