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

Change-Id: I635a5dd2230cb5507e1a523cb3b089496c9a35e8