Fixes: 65204006 Test: visual Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
Bug: 33558692 Test: visual Test: RunSettingsRoboTests Change-Id: I9f0fb71eb0cd0c58ac3b0f69544adec963faf2dd