am 0996fc88: am 717ad24a: am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '0996fc889372543bc0f0fc80df7d56dfae681ec5':
This commit is contained in: