Bug: 28563526 Change-Id: I574c4051bb19710409ca4cf4eeffef7be1a7d0ec Fixes: 28563526 Test: make RunSettingsRoboTests