am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into...
am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6c automerge: 7acd8802
* commit 'f1ffc75c':
Allow user shutdown broadcasts to be delivered