More migration to Global settings.

Bug: 7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
4 files changed