Merge "Change the name for the new rs_context parameter."