Merge "ART: Refactor GenerateTestAndBranch" am: 3ce45f4e6a
am: 35f0015e7b

* commit '35f0015e7bd25e3769382b32e5e59d3d019efcb5':
  ART: Refactor GenerateTestAndBranch