Merge "diag: Update SSIDs, event ids and log codes"