am c81c408f: Merge "Change the name for the new rs_context parameter."

* commit 'c81c408f251d98a80a53c80dd010621c6b2da3c7':
  Change the name for the new rs_context parameter.