Bug: 184235563 Test: make and toggle GD settings, unit test Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666