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

Change-Id: Id3081f8874ac3e984cbb7cf3f446725a429a8a5c