am 67eab1e9: am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1

* commit '67eab1e9cd9a7bfb1a32492cdaa6f52bf470e11d':
  Fix a race condition during Context init/teardown.