am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 automerge: 7acd880

* commit 'f1ffc75c9ec093ff780954f86c72a8a7069ca6cf':
  Allow user shutdown broadcasts to be delivered