Fixes: 155949554 Test: make RunSettingsLibRoboTests -j56 Change-Id: I54a31aed503f7f058887720ab4fe01ca2f39ff93