Merge "Fix endless crash when load Bluetooth database" am: 07b5be0aac am: 59353bd6ff
am: 10f536d162

Change-Id: I5fcb24ad220a68cb609912890213551f3b0c5a2d