Merge "Split up ti-agent/common_helper.cc"