Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev