Merge "msm: 8660: Add config setting for enabling content protection" into msm-3.4