Merge "Enabling more debug logging."