Fix broken settings tests

Bug: 214907472
Bug: 214907514
Test: make -j64 RunSettingsRoboTests
Change-Id: If87b1041f2e6357241963240efb5337ab31610bc
3 files changed