Bug: 79705354 Test: make RunSettingsRoboTests -j40 and manual testing. Change-Id: I08a08e05f3424f4a6d2100aed32d32bb15997c86