Merge "Build logtags for services"