Merge "msm: rpc: Fix uninitialized union in rpc router code"