Change-Id: I9c6db4481e9b03c8984d350cd54722a3667b6c49 Fixes: 70165342 Test: make RunSettingsRoboTests -j40