Bug: 36458278 Test: make RunSettingsRoboTests -j40 Change-Id: I0a41fdafadf71e20b76f999005dac66b6a52f570