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

Change-Id: I850a624d1d5de986c00f3d0e7280043dfb2dd1b6