Change-Id: Ib78a3c9434c8543f3be34932264802f1065cc54b Fix: 37134598 Test: robotests
Change-Id: I419c16cbfc69861e01f28c14abdde137bd78f0bb Fix: 36458355 Test: make RunSettingsRoboTests