Merge "msm: xo: Add NULL pointer and error pointer check" into msm-3.0