Merge "Don't wait for Bluetooth when shutting down" am: d9b3322e88
am: 9ae00d9d9a

Change-Id: I005548cc409547cc6bdb7182c6d9ea52b4a4a46d