Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev