Merge "Don't throw exception on unexpected BT device addition." into honeycomb