Expose more details in broadcasts

Expose details in broadcasts and do the necessary clean up alongside

Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
6 files changed