Bug: 35203304 Bug: 35852687 Test: make RunSettingsRoboTests -j40 Change-Id: Iaef671e0a9e8beb560e1d2c9864f44ef46993a6b