More tuning of log messages and agent reporting.

Change-Id: Ic6df4be42fcf87aba9b5275643ab4abebee79e6c