am c837d22b: Merge "BCCContext is actually dead code."

* commit 'c837d22b93b0e0f5854a523d14956fc4a43a26a8':
  BCCContext is actually dead code.