Fix: 31707295 Test: make RunSettingRoboTests Test: verify logs Change-Id: Icf70900ac4472195624d14e9172207a5c85dccca