am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev

* commit 'c2f8da8756553bb682e0e202779063965a89dced':
  Bring along BridgeContext for the ride.