Merge "diag: Fix for CRC check for Control byte"