am 28c7c788: am a15ac5fe: am adb52ef7: Merge "Implement finalizer for RS contexts."

* commit '28c7c788a97d8ba133c263d4ebde8629b5af0335':
  Implement finalizer for RS contexts.