Merge "msm: rpc: add shutdown and restart handler for rpc"