Merge "diag: diag over uart not working for QSC"