Bug: 32463283 Test: make RunSettingsRoboTests Change-Id: Ibf3cf9af05b44a071603d3d7efa6e90ae00c823a
Bug: 33775510 Fixes: 33787883 Test: visual Change-Id: I886e75551f3510d85b6047cc55c26dd21c5c55df