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

* commit '70cf2f72f2e19570d81c1365164313437b38ffd5':
  Fix crash in BluetoothControllerImpl