Merge "msm: adsprpc: Fix array index underflow problem"