Bug: 190187197 Bug: 190239610 Test: make RunSettingsRoboTests Change-Id: I113eb738003531c67acd72aa8f597e9c34ca2cc9
d42d9a41f6