Merge "diag: Add diag over pcie support"