am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'c7fc094d319998572087e983e21c62de9f318139':
  Fix rare NPE in BridgeContext.