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

* commit 'a15ac5fea3c88f908bf808d7b4cda276fb3f513f':
  Implement finalizer for RS contexts.