Merge "Remove more Slog usages in statsd apex"