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

Change-Id: I83fa66ba4667576a21449fb82414f0945ec6c21d