Merge "diag: Modify diag to support multiple hsic instances"