Merge "ART: Refactor GenerateTestAndBranch"
am: 3ce45f4e6a

* commit '3ce45f4e6abd725407a539521f69959a6ac5a9c1':
  ART: Refactor GenerateTestAndBranch