Merge "Remove __DATE__ and __TIME__ from tracing"