Merge "diag: Check buffer size against command structure size"