Merge "RpcSession change CVD to CID" into main