Merge "msm: rpm_resources: Remove L2 resource for 9x15" into msm-3.0