am 12bb2c4c: am fe7c2a50: Merge change I996db8da into eclair

Merge commit '12bb2c4c6d73c5b9e531ba852fb6260bb8b87411' into eclair-mr2-plus-aosp

* commit '12bb2c4c6d73c5b9e531ba852fb6260bb8b87411':
  Fix tls crash on startup if more than one RS contexts are created in one process.