Merge "msm: ipc: Update the wakelock name to include client info" into msm-3.0