Merge "Add AndroidTest.xml to incident_helper and incidentd"