Bug: 138620011 Test: build, make RunSettingsLibRoboTests Change-Id: I49fc53503eb5bb3cdd6f2bae66e5d0b7808e5d3d
Change-Id: I5240dcacdcd8b87a0965a0a9359cd7832b42e590 Fixes: 116364655 Test: robotests