Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1