Fixes: 141582844 Test: make -j42 RunSettingsLibRoboTests Change-Id: I432c12b60016d2230df625155d3c76dbba926077