Merge "Revert "Logging to track #36406078""