Merge "msm: 8610: rename 8910 to 8610"