am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev am: 621975ad96

Original change: undetermined

Change-Id: I3527c19149c9aab01c37b94810c9574dd789ef3e