Merge "diag: Add support for 9615, 8260A, and 8974 targets" into msm-3.0