Merge "Merge "Don't wait for Bluetooth when shutting down" am: d9b3322e88 am: 9ae00d9d9a am: 51019ab1d5  -s ours"