Improved agent reporting.

Change-Id: I62dfcde9c290e2b9f5b806ebf6f50e8431635aa1