Merge "msm: adsprpc: Handle NULL pointer dereference"