am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
automerge: 49d3c36

* commit '49d3c36134f818e06dc6c71d462ee8369c73c195':
  Fix rare NPE in BridgeContext.