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

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