Merge "msm: sps: add input checking for SPS APIs" into msm-3.0