Fix: 34205150 Test: make -j40 RunSettingsRoboTests Change-Id: I7a8a0c89c087365fb50f3a9edd2cf64b2dda647c