Change-Id: I55025094b9a0e71710db726bcf7fc810a3705c65 Fix: 62262851 Fix: 62283797 Test: make RunSettingsRoboTests
bug:25246207 Change-Id: I91669448c140b565d37563002a3ccbfb211d283b