Merge "Two request contexts in Rpc context"