Merge "Log debug and trace tags to statsd." into main