Merge "Revert "Add latency logging for rotation""