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

merged from goog/mirror-m-wireless-internal-release
ad04942 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge: 49d3c36