Bug: 73892555 Bug: 73892683 Test: m RunSettingsRoboTests Change-Id: Id4145600240f12c2cc2f5aed978a1fe65fd1fd74