am 6eb4c5bf: Merge "Add flags to context creation for RS"

* commit '6eb4c5bf830c952d70473edff5f2b8e5ab98ce29':
  Add flags to context creation for RS