Merge "msm: rpm: Update RPM ids to match 8064 fabric ids" into msm-3.0