Manual merge from: ag/2155898 Bug: 37501479 Test: make RunSettingsRoboTests Change-Id: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb