Merge "ART: Refactor GenerateTestAndBranch"