Bug: 36557316 Test: make RunSettingsRoboTests Change-Id: I52985e527e55697cf29f8d97d775d4bbed025beb
Fix: 34280137 Test: make RunSettingsRoboTests Change-Id: Ib44e39589781d68c7952a2c16a44682791a422f1