am 239c7667: am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev automerge: 70cf2f7

* commit '239c7667dd71754029b27fdec7b63f7f8e15c86b':
  Fix crash in BluetoothControllerImpl