Also renamed a few xmls Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a Fix: 36357493 Test: make RunSettingsRoboTests