Merge "CarDiagnosticEvent clean up" into qt-dev am: 9cb25cb048
am: 3ae5b4c549

Change-Id: I166ec781bfae7ce3b33a5579f9b4caa4f8a0853e