Merge "diag: Increase HSIC throughput by implementing multiple simultaneous reads" into msm-3.4