Bug: 33252252 Test: make RunSettingsRoboTests Change-Id: I8ea3a144f2bee3d979b909aba29a3360e25fd04b
Bug: 31799948 Test: manual Change-Id: Iaab1a5988af30504d4e34ff4f63ae69e86b70f27