Merge "diag: Fix improper handling of Diag real time vote IOCTL"