Bug: 70950124 Test: manual Test: make RunSettingsRoboTests Change-Id: I671a605fe341f36adeb6ae239333295ddfb550c7