Merge "Do not turn on Bluetooth when booting into Safe Mode" am: 34ed823d am: 8ae1de7a am: 121bafc5 am: 88ddf773 Change-Id: Iccfe6a6854f9e22cdc5a5bcdafc4529116bc88bf