Change-Id: I19ab9d0d480b66e56b87cef7c49d4391a3608111 Fix: 36069170 Test: make RunSettingsRoboTests
Change-Id: Ieaf413e3d698a9cbcb0560bfa65f380675677a74 Fix: 34976128 Test: make RunSettingsRoboTests