Merge "diag: Update SSIDs and log codes"