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