Merge "diag: Fix incorrect handling of diag polling command"