Merge "diag: Add support for mutiple HSIC instances"