Bug: 63441962 Test: manual && make -j RunSettingsRoboTests Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2c826d7