Bug: 236101687 Bug: 241738105 Test: make RunSettingsRoboTests Change-Id: Iee04f96083eff7ff5cd61a7c1f2eda20a6dc9149