Improved agent report and notification bug fix.

Change-Id: I71b023a0d541c9ab89667ed0c205031ef5cf47ea