am 4dca31bd: Merge "Update references to migrated global settings." into jb-mr1-dev

* commit '4dca31bdc6ef612c8c77af14dc5f700c32fa938e':
  Update references to migrated global settings.